*** empty log message ***

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 41559f85cb5636a265f3867910ba32b44041b533..7501648595ce559355611cc86570888957878eb1 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-24  Alan Mackenzie  <acm@muc.de>
+
+       * cc-mode.texi (Config Basics, File Styles): Document that at mode
+       initialization, any individual variable setting now takes precedence
+       over one done via c-file-style/c-file-offsets.
+
 2009-07-21  Jay Belanger  <jay.p.belanger@gmail.com>
 
        * calc.texi (Undoing Mistakes): Mention that the undo list will be